From 946ed067ca372bce79a313836e94e471bba022ba Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 11 Dec 2010 12:13:16 -0600 Subject: [PATCH] Mention the fullscreen "maximized" value in the emacs man page. --- debian/changelog | 8 ++++ .../mention-maximized-in-emacs-manpage.diff | 43 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 52 insertions(+) create mode 100644 debian/patches/mention-maximized-in-emacs-manpage.diff diff --git a/debian/changelog b/debian/changelog index e6cce1430bf..306d3f59fa7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +emacs23 (23.2+1-8) unstable; urgency=low + + * Mention the fullscreen "maximized" value in the emacs man page. + Thanks to Peter Eisentraut for the report and + Sven Joachim for the patch. (closes: #594320) + + -- Rob Browning Sat, 11 Dec 2010 12:12:37 -0600 + emacs23 (23.2+1-7) unstable; urgency=low * Don't initialize the terminal twice. Previously a console-mode diff --git a/debian/patches/mention-maximized-in-emacs-manpage.diff b/debian/patches/mention-maximized-in-emacs-manpage.diff new file mode 100644 index 00000000000..af6cbcaaf0a --- /dev/null +++ b/debian/patches/mention-maximized-in-emacs-manpage.diff @@ -0,0 +1,43 @@ +* The emacs manpage now mentions the "maximized" value for fullscreen. + Patch: mention-maximized-in-emacs-manpage.diff + Provided-by: Sven Joachim + Date: Wed, 25 Aug 2010 17:54:33 +0200 + Added-by: Rob Browning + Status: incorporated upstream + + The Debian patch is taken from this upstream commit: + + revno: 100003 + committer: Chong Yidong + branch nick: emacs-23 + timestamp: Thu 2010-08-26 11:14:55 -0400 + message: + * emacs.1: Mention "maximized" value for the "fullscreen" X resource. + +--- a/doc/man/ChangeLog ++++ b/doc/man/ChangeLog +@@ -1,3 +1,7 @@ ++2010-08-26 Sven Joachim ++ ++ * emacs.1: Mention "maximized" value for the "fullscreen" X resource. ++ + 2010-05-07 Chong Yidong + + * Version 23.2 released. +--- a/doc/man/emacs.1 ++++ b/doc/man/emacs.1 +@@ -403,11 +403,12 @@ + The desired fullscreen size. + The value can be one of + .IR fullboth , ++.IR maximized , + .IR fullwidth , + or + .IR fullheight , +-which correspond to the command-line options `\-fs', `\-fw', and +-`\-fh', respectively. ++which correspond to the command-line options `\-fs', `-mm', `\-fw', ++and `\-fh', respectively. + Note that this applies to the initial frame only. + .TP + .BR geometry " (class " Geometry ) diff --git a/debian/patches/series b/debian/patches/series index e1754377a07..abd00ae0f5d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ fix-gnus-output-to-mail-with-live-rmail-buffers.diff fix-fc-dual-font-width-calculation.diff do-not-initialize-terminal-twice.diff fix-epg-digest-algorithm-alist.diff +mention-maximized-in-emacs-manpage.diff -- 2.30.2